Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/emacs.c
index 5d9317ada17c526b0de2939135780b39ad64ad77,69d10821fae1ad33435f3cc0ef3b4fff6ed76828..738ef12c98c6c499b99a5cd4f7578ec81f8577f8
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -1984,17 -1956,7 +1984,12 @@@ Using an Emacs configured with --with-x
        syms_of_json ();
  #endif
  
-       keys_of_casefiddle ();
-       keys_of_cmds ();
-       keys_of_buffer ();
        keys_of_keyboard ();
-       keys_of_keymap ();
-       keys_of_window ();
 +
 +#ifdef HAVE_NATIVE_COMP
 +      /* Must be after the last defsubr has run.  */
 +      hash_native_abi ();
 +#endif
      }
    else
      {

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc test/Makefile.in
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge